Merge branch 'webengine'
authorRobert Lipe <robertlipe@gpsbabel.org>
Wed, 25 Jan 2017 23:29:57 +0000 (17:29 -0600)
committerRobert Lipe <robertlipe@gpsbabel.org>
Wed, 25 Jan 2017 23:29:57 +0000 (17:29 -0600)
1  2 
GPSBabel.pro
mtk_logger.cc

diff --cc GPSBabel.pro
Simple merge
diff --cc mtk_logger.cc
Simple merge